MSVC builds: Enhance Binary Installation

Update the gtk-install-bin property sheets so that it does not "install"
the wrong GDK DLL/LIB when building a broadway-enabled GDK
when the non-Broadway GDK had been previously built.

diff --git a/build/win32/vs10/gtk-install-bin.props b/build/win32/vs10/gtk-install-bin.props
index 54fe5623347abd33bf4dee72aa5f8480642e1070..b1602d3065055dfa49b25904a25c2362e5bd74ef 100644 (file)
--- a/build/win32/vs10/gtk-install-bin.props
+++ b/build/win32/vs10/gtk-install-bin.props
@@ -10,9 +10,9 @@ mkdir $(CopyDir)\bin
 mkdir $(CopyDir)\lib\r
 \r
 \r
-if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN\r
+if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN\r
 \r
-if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN\r
+if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN\r
 \r
 \r
 copy $(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin\r
@@ -33,16 +33,24 @@ copy $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
 copy $(Configuration)\$(Platform)\bin\broadwayd.exe $(CopyDir)\bin\r
 \r
 \r
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin\r
 \r
-if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin\r
+\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib\r
+\r
+if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib\r
 \r
 if "$(Configuration)" == "Release_Broadway" copy .\Release\$(Platform)\bin\*.exe $(CopyDir)\bin\r
 \r
 \r
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.dll $(CopyDir)\bin\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-3-vs*.dll $(CopyDir)\bin\r
+\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-3-vs*.dll $(CopyDir)\bin\r
+\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib\r
 \r
-if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*-$(ApiVersion).lib $(CopyDir)\lib\r
+if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib\r
 \r
 if "$(Configuration)" == "Debug_Broadway" copy .\Debug\$(Platform)\bin\*.exe $(CopyDir)\bin\r
 \r

diff --git a/build/win32/vs9/gtk-install-bin.vsprops b/build/win32/vs9/gtk-install-bin.vsprops
index 08ede662640898b966896b880ecb7f2482b1c58f..47e79e8407cf257f6d2c99cec3797f23b234f004 100644 (file)
--- a/build/win32/vs9/gtk-install-bin.vsprops
+++ b/build/win32/vs9/gtk-install-bin.vsprops
@@ -11,8 +11,8 @@
 mkdir $(CopyDir)\bin
\r
 mkdir $(CopyDir)\lib
\r
 \r
-if exist ..\..\..\MSVC_Release_Broadway goto DO_BROADWAY_BIN
\r
-if exist ..\..\..\MSVC_Debug_Broadway goto DO_BROADWAY_BIN
\r
+if "$(ConfigurationName)" == "Release_Broadway" goto DO_BROADWAY_BIN
\r
+if "$(ConfigurationName)" == "Debug_Broadway" goto DO_BROADWAY_BIN
\r
 \r
 copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin
\r
 copy $(ConfigurationName)\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
\r
@@ -24,12 +24,16 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gdk-3-vs*.dll $(CopyDir)\bin
 copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib
\r
 copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin
\r
 \r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.dll $(CopyDir)\bin
\r
-if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk-3-*.dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil-3-*.dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gtk*-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\gailutil*-$(ApiVersion).lib $(CopyDir)\lib
\r
 if "$(ConfigurationName)" == "Release_Broadway" copy .\Release\$(PlatformName)\bin\*.exe $(CopyDir)\bin
\r
 \r
-if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.dll $(CopyDir)\bin
\r
-if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-3-.dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-3-.dll $(CopyDir)\bin
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
\r
+if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
\r
 if "$(ConfigurationName)" == "Debug_Broadway" copy .\Debug\$(PlatformName)\bin\*.exe $(CopyDir)\bin
\r
 :DONE_BIN
\r
                                     "\r